tools: provide explicit target for refetching/resetting qemu

This patch adds an explicit update mechanism:
  make tools/ioemu-dir-force-update
This isn't brilliant but is better than doing "cd tools/ioemu-remote
&& git reset --hard <sha1...>" by hand.

Note that invoking this target will destroy all working tree changes
made to qemu-xen.

Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>

diff --git a/Makefile b/Makefile
index 17abb5f7d79f1e385a0bade2e34efd9e2fd8951d..662e31f549d1135c7812e71629bef5bc31042a04 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -83,6 +83,10 @@ endif
 tools/ioemu-dir:
        $(MAKE) -C tools ioemu-dir-find
 
+.PHONY: tools/ioemu-dir-force-update
+tools/ioemu-dir-force-update:
+       $(MAKE) -C tools ioemu-dir-force-update
+
 .PHONY: install-docs
 install-docs:
        sh ./docs/check_pkgs && $(MAKE) -C docs install || true

diff --git a/tools/Makefile b/tools/Makefile
index ed70b93a84548c2ebc250f34348dafd3ba0e9af4..b5ca6354095a0677d3a9242aae7411eb4bfc1cf0 100644 (file)
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -117,6 +117,14 @@ ioemu-dir-find:
                cd ioemu-dir; \
                ./xen-setup $(IOEMU_CONFIGURE_CROSS)
 
+.PHONY: ioemu-dir-force-update
+ioemu-dir-force-update:
+       set -ex; \
+       if [ "$(QEMU_TAG)" ]; then \
+               cd ioemu-remote; \
+               $(GIT) reset --hard $(QEMU_TAG); \
+       fi
+
 subdir-all-ioemu-dir subdir-install-ioemu-dir: ioemu-dir-find
 
 subdir-clean-ioemu-dir: